From d4731a4ab45e5a0c180d8eb3ce9182b25211112d Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 17 May 2020 01:02:17 +0200
Subject: [PATCH] x11: Remove gdk_x11_register_standard_event_type()

It's not used anymore since GdkX11Display::xevent exists.
---
 docs/reference/gdk/gdk4-sections.txt |  1 -
 gdk/x11/gdkdisplay-x11.c             | 49 ----------------------------
 gdk/x11/gdkdisplay-x11.h             |  6 ----
 gdk/x11/gdkx11display.h              |  5 ---
 4 files changed, 61 deletions(-)

diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index d5c6ffdf3f..be316a39d8 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -829,7 +829,6 @@ gdk_x11_display_error_trap_pop_ignored
 gdk_x11_display_set_cursor_theme
 gdk_x11_display_set_surface_scale
 gdk_x11_display_get_glx_version
-gdk_x11_register_standard_event_type
 gdk_x11_screen_get_screen_number
 gdk_x11_screen_get_xscreen
 gdk_x11_screen_get_window_manager_name
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 203feadcf5..865021bb55 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1430,8 +1430,6 @@ gdk_x11_display_open (const gchar *display_name)
 	      display_x11->have_randr15 = TRUE;
 #endif
       }
-
-       gdk_x11_register_standard_event_type (display, display_x11->xrandr_event_base, RRNumberEvents);
   }
 #endif
 
@@ -1464,10 +1462,6 @@ gdk_x11_display_open (const gchar *display_name)
 			    &ignore))
     {
       display_x11->have_xfixes = TRUE;
-
-      gdk_x11_register_standard_event_type (display,
-					    display_x11->xfixes_event_base, 
-					    XFixesNumberEvents);
     }
   else
 #endif
@@ -1497,10 +1491,6 @@ gdk_x11_display_open (const gchar *display_name)
 			     &ignore))
     {
       display_x11->have_xdamage = TRUE;
-
-      gdk_x11_register_standard_event_type (display,
-					    display_x11->xdamage_event_base,
-					    XDamageNumberEvents);
     }
   else
 #endif
@@ -1940,12 +1930,6 @@ gdk_x11_display_finalize (GObject *object)
   /* Leader Window */
   XDestroyWindow (display_x11->xdisplay, display_x11->leader_window);
 
-  /* List of event window extraction functions */
-  g_slist_free_full (display_x11->event_types, g_free);
-
-  /* input GdkSurface list */
-  g_list_free_full (display_x11->input_surfaces, g_free);
-
   /* Free all GdkX11Screens */
   g_object_unref (display_x11->screen);
   g_list_free_full (display_x11->screens, g_object_unref);
@@ -2439,39 +2423,6 @@ gdk_x11_display_set_startup_notification_id (GdkDisplay  *display,
     }
 }
 
-/**
- * gdk_x11_register_standard_event_type:
- * @display: (type GdkX11Display): a #GdkDisplay
- * @event_base: first event type code to register
- * @n_events: number of event type codes to register
- *
- * Registers interest in receiving extension events with type codes
- * between @event_base and `event_base + n_events - 1`.
- * The registered events must have the window field in the same place
- * as core X events (this is not the case for e.g. XKB extension events).
- *
- * GDK may register the events of some X extensions on its own.
- *
- * This function should only be needed in unusual circumstances, e.g.
- * when filtering XInput extension events on the root window.
- **/
-void
-gdk_x11_register_standard_event_type (GdkDisplay *display,
-				      gint        event_base,
-				      gint        n_events)
-{
-  GdkEventTypeX11 *event_type;
-  GdkX11Display *display_x11;
-
-  display_x11 = GDK_X11_DISPLAY (display);
-  event_type = g_new (GdkEventTypeX11, 1);
-
-  event_type->base = event_base;
-  event_type->n_events = n_events;
-
-  display_x11->event_types = g_slist_prepend (display_x11->event_types, event_type);
-}
-
 /* look up the extension name for a given major opcode.  grubs around in
  * xlib to do it since a) it’s already cached there b) XQueryExtension
  * emits protocol so we can’t use it in an error handler.
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index e3b9305c2f..4495a8b1a2 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -99,18 +99,12 @@ struct _GdkX11Display
   GdkSurface *leader_gdk_surface;
   gboolean leader_window_title_set;
 
-  /* List of functions to go from extension event => X window */
-  GSList *event_types;
-
   /* X ID hashtable */
   GHashTable *xid_ht;
 
   /* streams reading selections */
   GSList *streams;
 
-  /* input GdkSurface list */
-  GList *input_surfaces;
-
   /* GdkCursor => XCursor */
   GHashTable *cursors;
 
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 676886d34a..78356d287f 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -125,11 +125,6 @@ G_GNUC_WARN_UNUSED_RESULT gint gdk_x11_display_error_trap_pop         (GdkDispla
 GDK_AVAILABLE_IN_ALL
 void                           gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display);
 
-GDK_AVAILABLE_IN_ALL
-void        gdk_x11_register_standard_event_type (GdkDisplay *display,
-                                                  gint        event_base,
-                                                  gint        n_events);
-
 GDK_AVAILABLE_IN_ALL
 void        gdk_x11_set_sm_client_id (const gchar *sm_client_id);
 
-- 
2.30.2